Merge branch 'master' of https://github.com/bmag/emacs-which-key into pr5
authorjustbur <justin@burkett.cc>
Mon, 6 Jul 2015 12:08:32 +0000 (08:08 -0400)
committerjustbur <justin@burkett.cc>
Mon, 6 Jul 2015 12:08:32 +0000 (08:08 -0400)
1  2 
which-key.el

diff --cc which-key.el
Simple merge